bitkeeper revision 1.1159.1.452 (41a518b5fn2ukjMlz6_PRNf0x_pLeQ)

sched.h, entry.S:
  XXX Disable hypercall preemption for now.

diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index ad6477f7a8f7702fcabf133ce71b8ffb1c3c5b45..fdd2a672580601fecbc091a8f95bf969a7378203 100644 (file)
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -98,8 +98,8 @@ multicall_loop:
         movl  4(%esp),%ecx               # %ecx = struct domain
         movl  EDOMAIN_processor(%ecx),%eax
         shl   $6,%eax                    # sizeof(irq_cpustat) == 64
-        testl $~0,SYMBOL_NAME(irq_stat)(%eax,1)
-        jnz   multicall_preempt
+        #testl $~0,SYMBOL_NAME(irq_stat)(%eax,1)
+        #jnz   multicall_preempt
 multicall_fault1: 
         pushl 20(%ebx)      # args[4]
 multicall_fault2: 

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 7a96a6a1fe7c8674c2508e45b5e4fff5ae80baf0..cf1ac0abb87d0919d7880e1b23f7dab9ce0b4376 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -258,6 +258,7 @@ void continue_cpu_idle_loop(void);
 void continue_nonidle_task(void);
 
 void hypercall_create_continuation(unsigned int op, unsigned int nr_args, ...);
+#if 0
 #define hypercall_may_preempt(_op, _nr_args, _args...)               \
     do {                                                             \
         if ( unlikely(softirq_pending(smp_processor_id())) ) {       \
@@ -271,6 +272,10 @@ void hypercall_create_continuation(unsigned int op, unsigned int nr_args, ...);
             UNLOCK_BIGLOCK(_d);                                      \
             return _op;                                              \
     } } while ( 0 )
+#else
+#define hypercall_may_preempt(_op, _nr_args, _args...)
+#define locked_hypercall_may_preempt(_d, _op, _nr_args, _args...)
+#endif
 
 /* This domain_hash and domain_list are protected by the domlist_lock. */
 #define DOMAIN_HASH_SIZE 256